HVM: Allow qemu monitor to be configured in domain config file.

From: Yongkang You <yongkang.you@intel.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm
index 06662a0d17baee7314d9adf61cbc519e24164b03..c027f0821bc7389048712e0d470c88bec4aa6128 100644 (file)
--- a/tools/examples/xmexample.hvm
+++ b/tools/examples/xmexample.hvm
@@ -169,6 +169,12 @@ stdvga=0
 serial='pty'
 
 
+#-----------------------------------------------------------------------------
+#   Qemu Monitor, default is disable
+#   Use ctrl-alt-2 to connect
+#monitor=1
+
+
 #-----------------------------------------------------------------------------
 #   enable sound card support, [sb16|es1370|all|..,..], default none
 #soundhw='sb16'

diff --git a/tools/examples/xmexample.vti b/tools/examples/xmexample.vti
index a9ff77b4ce1bf66d99d83e7deba5a4b75abfe41a..05a7d0866f285bce9ea11bb911bf90736a6cb396 100644 (file)
--- a/tools/examples/xmexample.vti
+++ b/tools/examples/xmexample.vti
@@ -112,6 +112,11 @@ stdvga=0
 #   then xm console or minicom can connect
 serial='pty'
 
+#-----------------------------------------------------------------------------
+#   Qemu Monitor, default is disable
+#   Use ctrl-alt-2 to connect
+#monitor=1
+
 #-----------------------------------------------------------------------------
 #   enable sound card support, [sb16|es1370|all|..,..], default none
 #soundhw='sb16'

diff --git a/tools/python/README.XendConfig b/tools/python/README.XendConfig
index 2e677f887a4595d4e554dee3c3756e6d8232ca8c..9776f3307b6dae23b42d5277183d9dfd29a9d205 100644 (file)
--- a/tools/python/README.XendConfig
+++ b/tools/python/README.XendConfig
@@ -115,6 +115,7 @@ otherConfig
                                 image.nographic
                                 image.vnc
                                 image.sdl
+                                image.monitor
                                 image.vncdisplay
                                 image.vncunused
                                 image.hvm.device_model

diff --git a/tools/python/README.sxpcfg b/tools/python/README.sxpcfg
index 9beffd6ba0988b256a9423cde918f619a9af14b2..7a17fd1515efa684177a4f80c18d9e3490669080 100644 (file)
--- a/tools/python/README.sxpcfg
+++ b/tools/python/README.sxpcfg
@@ -63,6 +63,7 @@ image
   - fdb
   - soundhw
   - localtime
+  - monitor
   - serial
   - stdvga
   - isa

diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py
index a4a9d43fe591d0e505e896bd6ae2a1d6e7951a3d..a85be3fae6c6a897142029e40148771615d8e1ec 100644 (file)
--- a/tools/python/xen/xend/XendConfig.py
+++ b/tools/python/xen/xend/XendConfig.py
@@ -117,7 +117,7 @@ LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(XENAPI_CFG_TO_LEGACY_CFG)
 
 # Platform configuration keys.
 XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'display', 
-                        'fda', 'fdb', 'keymap', 'isa', 'localtime',
+                        'fda', 'fdb', 'keymap', 'isa', 'localtime', 'monitor', 
                         'nographic', 'pae', 'rtc_timeoffset', 'serial', 'sdl',
                         'soundhw','stdvga', 'usb', 'usbdevice', 'vnc',
                         'vncconsole', 'vncdisplay', 'vnclisten',

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 8f119b3ae10cac4fe0f579489521f27a45ef2eca..a4e785d96a63a3282bded27ed5f271268437bf98 100644 (file)
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -415,6 +415,8 @@ class HVMImageHandler(ImageHandler):
         else:
             ret.append('-nographic')
 
+        if int(vmConfig['platform'].get('monitor', 0)) != 0:
+            ret.append('-monitor vc')
         return ret
 
     def createDeviceModel(self, restore = False):

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index 1411f9be89b8b7ea987c74d618206cd9bcb17ff4..e68722cb8cb24513647e1a2e19a739f09660b83b 100644 (file)
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -421,6 +421,10 @@ gopts.var('serial', val='FILE',
           fn=set_value, default='',
           use="Path to serial or pty or vc")
 
+gopts.var('monitor', val='no|yes',
+          fn=set_bool, default=0,
+          use="""Should the device model use monitor?""")
+
 gopts.var('localtime', val='no|yes',
           fn=set_bool, default=0,
           use="Is RTC set to localtime?")